From 2f0d4f6e7e37f15a6b28f2044a63c9ba242716a8 Mon Sep 17 00:00:00 2001
From: Juri Linkov <juri@jurta.org>
Date: Thu, 28 Feb 2008 22:43:30 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 328ccf66cc8..51af30f03dd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-28  Juri Linkov  <juri@jurta.org>
+
+	* startup.el: Always add initial message to *scratch* buffer if
+	`initial-scratch-message' is non-nil regardless of the value of
+	`inhibit-startup-screen'.
+	(inhibit-startup-screen, initial-scratch-message): Doc fix.
+	(command-line-1): Move code that inserts `initial-scratch-message'
+	up before the if-form that checks for `inhibit-startup-screen'.
+	Suggested by Jonathan Rockway <jon@jrock.us>.
+
 2008-02-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* textmodes/fill.el (fill-comment-paragraph): Don't try to do
-- 
2.30.2